From: Keir Fraser <keir@xen.org>
Date: Fri, 11 Jan 2013 13:45:09 +0000 (+0000)
Subject: xsm: Dummy hook functions must be always_inline to ensure constant
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7449
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=17ef427485fde825bb8f9a6373e2471e0882290b;p=xen.git

xsm: Dummy hook functions must be always_inline to ensure constant
propagation and dead-code elimination makes LINKER_BUG_ON() operate
properly.

Signed-off-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h
index 18f36b22bf..1ca82b0680 100644
--- a/xen/include/xsm/dummy.h
+++ b/xen/include/xsm/dummy.h
@@ -46,15 +46,15 @@ void __xsm_action_mismatch_detected(void);
  * compile-time checks on the xsm_default_t argument to ensure that the behavior
  * of the dummy XSM module is the same as the behavior with XSM disabled.
  */
-#define XSM_INLINE inline
+#define XSM_INLINE always_inline
 #define XSM_DEFAULT_ARG xsm_default_t action,
 #define XSM_DEFAULT_VOID xsm_default_t action
 #define XSM_ASSERT_ACTION(def) LINKER_BUG_ON(def != action)
 
 #endif /* XSM_ENABLE */
 
-static inline int xsm_default_action(xsm_default_t action, struct domain *src,
-                                     struct domain *target)
+static always_inline int xsm_default_action(
+    xsm_default_t action, struct domain *src, struct domain *target)
 {
     switch ( action ) {
     case XSM_HOOK: